Auto merge of #1340 - alexcrichton:issue-1329, r=huonw
authorbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:28:31 +0000 (00:28 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:28:31 +0000 (00:28 +0000)
commitb6c07a62991a2954ca501638fcb000555add4a77
treea28e89092aeb0bd54f69b0de49dfe0391dac709b
parent8738c61545f10d1f21aeb1fe33f9412339a13ed7
parent93fa4c1640aad29d8c0ce410654d72059e115a77
Auto merge of #1340 - alexcrichton:issue-1329, r=huonw

Closes #1329